From 54889709120dc9d56e1e4110282d425c86e3a83b Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Fri, 6 Dec 2019 13:02:43 -0700 Subject: [PATCH] clean up filter includes. (#431) remove obsolete definition of filter_vecs_t. don't included filterdefs.h in each filters .cc file. add QVector include to each filters .h file. --- arcdist.cc | 1 - arcdist.h | 2 ++ bend.cc | 1 - bend.h | 2 ++ discard.cc | 1 - discard.h | 2 ++ duplicate.cc | 1 - duplicate.h | 2 ++ filter.h | 4 ++++ filterdefs.h | 27 ++++----------------------- height.cc | 1 - height.h | 2 ++ interpolate.cc | 1 - interpolate.h | 2 ++ nukedata.cc | 1 - nukedata.h | 2 ++ polygon.cc | 1 - polygon.h | 2 ++ position.cc | 1 - position.h | 2 ++ radius.cc | 1 - radius.h | 2 ++ reverse_route.cc | 1 - reverse_route.h | 3 +++ smplrout.cc | 1 - smplrout.h | 2 ++ sort.cc | 1 - sort.h | 2 ++ stackfilter.cc | 1 - stackfilter.h | 2 ++ swapdata.cc | 1 - swapdata.h | 2 ++ trackfilter.cc | 1 - trackfilter.h | 1 + transform.cc | 1 - transform.h | 2 ++ validate.cc | 1 - validate.h | 2 ++ 38 files changed, 44 insertions(+), 41 deletions(-) diff --git a/arcdist.cc b/arcdist.cc index 962fe3ad4..749efdef4 100644 --- a/arcdist.cc +++ b/arcdist.cc @@ -22,7 +22,6 @@ #include "defs.h" #include "arcdist.h" -#include "filterdefs.h" #include "grtcirc.h" #include diff --git a/arcdist.h b/arcdist.h index 0c158b78c..ef12f39c3 100644 --- a/arcdist.h +++ b/arcdist.h @@ -22,6 +22,8 @@ #ifndef ARCDIST_H_INCLUDED_ #define ARCDIST_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for ARG_NOMINMAX, ARGTYPE_BOOL, Waypoint (ptr only) #include "filter.h" // for Filter diff --git a/bend.cc b/bend.cc index 4dd6f7f55..65839d2ea 100644 --- a/bend.cc +++ b/bend.cc @@ -27,7 +27,6 @@ #include // for qAsConst, QAddConst<>::Type, foreach #include "defs.h" -#include "filterdefs.h" #include "bend.h" #include "grtcirc.h" // for RAD, heading_true_degrees, gcdist, linepart, radtometers, DEG diff --git a/bend.h b/bend.h index 6e6f4977a..643051df6 100644 --- a/bend.h +++ b/bend.h @@ -23,6 +23,8 @@ #ifndef BEND_H_INCLUDED_ #define BEND_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for route_head (ptr only), ARGTYPE_FLOAT, ARG_NOMINMAX #include "filter.h" // for Filter diff --git a/discard.cc b/discard.cc index 42edf8a73..5361b496e 100644 --- a/discard.cc +++ b/discard.cc @@ -21,7 +21,6 @@ #include "defs.h" #include "discard.h" -#include "filterdefs.h" #include // Can't use QRegularExpression because Linux won't get Qt 5 for years. #include diff --git a/discard.h b/discard.h index 155731d50..76f8e8167 100644 --- a/discard.h +++ b/discard.h @@ -24,6 +24,8 @@ // Can't use QRegularExpression because Linux won't get Qt 5 for years. #include // for QRegExp +#include // for QVector + #include "defs.h" // for ARG_NOMINMAX, ARGTYPE_BEGIN_REQ, ARGTYPE_S... #include "filter.h" // for Filter diff --git a/duplicate.cc b/duplicate.cc index 0583f7e48..9642d0a28 100644 --- a/duplicate.cc +++ b/duplicate.cc @@ -27,7 +27,6 @@ #include // for foreach #include "defs.h" -#include "filterdefs.h" #include "duplicate.h" #include "src/core/datetime.h" // for DateTime diff --git a/duplicate.h b/duplicate.h index e34607f3f..d7fba88d8 100644 --- a/duplicate.h +++ b/duplicate.h @@ -22,6 +22,8 @@ #ifndef DUPLICATE_H_INCLUDED_ #define DUPLICATE_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for ARGTYPE_BOOL, ARG_NOMINMAX, Waypoint (ptr only) #include "filter.h" // for Filter diff --git a/filter.h b/filter.h index 6f8c3dc7d..6147afa74 100644 --- a/filter.h +++ b/filter.h @@ -22,6 +22,10 @@ #include "defs.h" +// Filter have access to the global_waypoint_list, which formats really +// shouldn't have. +extern WaypointList* global_waypoint_list; + class Filter { public: diff --git a/filterdefs.h b/filterdefs.h index 97b93ae8f..944f00836 100644 --- a/filterdefs.h +++ b/filterdefs.h @@ -19,33 +19,14 @@ */ - - -/* - * Filters can do some things that modules really shouldn't do. - * This is our (weak) attempt to make that distinction. - */ - #ifndef FILTERDEFS_H_INCLUDED_ #define FILTERDEFS_H_INCLUDED_ #include "defs.h" -#include "filter.h" - -extern WaypointList* global_waypoint_list; - -using filter_init = void (*)(); -using filter_process = void (*)(); -using filter_deinit = void (*)(); -using filter_exit = void (*)(); - -struct filter_vecs_t { - filter_init f_init; - filter_process f_process; - filter_deinit f_deinit; - filter_exit f_exit; - QVector* args; -}; + + +// forward declare filter to avoid exposing global_waypoint_list by filter.h +class Filter; Filter* find_filter_vec(const QString&); void free_filter_vec(Filter*); diff --git a/height.cc b/height.cc index a7699b7cc..a485629c7 100644 --- a/height.cc +++ b/height.cc @@ -23,7 +23,6 @@ #include "defs.h" -#include "filterdefs.h" #include "height.h" #include #include diff --git a/height.h b/height.h index 8a472e899..aba0b365f 100644 --- a/height.h +++ b/height.h @@ -24,6 +24,8 @@ #ifndef HEIGHT_H_INCLUDED_ #define HEIGHT_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for ARG_NOMINMAX, Waypoint (ptr only), arglist_t #include "filter.h" // for Filter diff --git a/interpolate.cc b/interpolate.cc index 754874201..1c98c50a7 100644 --- a/interpolate.cc +++ b/interpolate.cc @@ -25,7 +25,6 @@ #include // for qAsConst, QAddConst<>::Type, foreach #include "defs.h" -#include "filterdefs.h" #include "interpolate.h" #include "grtcirc.h" // for linepart, RAD, gcdist, radtomiles #include "src/core/datetime.h" // for DateTime diff --git a/interpolate.h b/interpolate.h index dbb0d9ecf..36fa127de 100644 --- a/interpolate.h +++ b/interpolate.h @@ -22,6 +22,8 @@ #ifndef INTERPOLATE_H_INCLUDED_ #define INTERPOLATE_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for ARG_NOMINMAX, arglist_t, ARGTYPE_BEGIN_EXCL, ARG... #include "filter.h" // for Filter diff --git a/nukedata.cc b/nukedata.cc index 6814caee6..0b30e9a8e 100644 --- a/nukedata.cc +++ b/nukedata.cc @@ -21,7 +21,6 @@ */ #include "defs.h" -#include "filterdefs.h" #include "nukedata.h" #if FILTERS_ENABLED diff --git a/nukedata.h b/nukedata.h index 2c7c87f05..e6fe6bea0 100644 --- a/nukedata.h +++ b/nukedata.h @@ -23,6 +23,8 @@ #ifndef NUKEDATA_H_INCLUDED_ #define NUKEDATA_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for ARGTYPE_BOOL, ARG_NOMINMAX, arglist_t, ARG_TERMI... #include "filter.h" // for Filter diff --git a/polygon.cc b/polygon.cc index fc29678f1..629c0d5aa 100644 --- a/polygon.cc +++ b/polygon.cc @@ -25,7 +25,6 @@ #include // for foreach #include "defs.h" -#include "filterdefs.h" // for global_waypoint_list #include "polygon.h" #include "gbfile.h" // for gbfclose, gbfgetstr, gbfopen, gbfile diff --git a/polygon.h b/polygon.h index 893273cfa..3137f1d67 100644 --- a/polygon.h +++ b/polygon.h @@ -22,6 +22,8 @@ #ifndef POLYGON_H_INCLUDED_ #define POLYGON_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for ARG_NOMINMAX, arglist_t, ARGTYPE_BOOL, ARGTYPE_FILE #include "filter.h" // for Filter diff --git a/position.cc b/position.cc index 95994fe6a..b2451e5fd 100644 --- a/position.cc +++ b/position.cc @@ -26,7 +26,6 @@ #include // for qAsConst, QAddConst<>::Type #include "defs.h" -#include "filterdefs.h" #include "grtcirc.h" // for RAD, gcdist, radtometers #include "position.h" diff --git a/position.h b/position.h index db95575e4..a7622c83b 100644 --- a/position.h +++ b/position.h @@ -22,6 +22,8 @@ #ifndef POSITION_H_INCLUDED_ #define POSITION_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for route_head (ptr only), ARG_NOMINMAX, ARGTYPE_FLOAT #include "filter.h" // for Filter diff --git a/radius.cc b/radius.cc index 5d7007308..73f4349e7 100644 --- a/radius.cc +++ b/radius.cc @@ -25,7 +25,6 @@ #include // for foreach #include "defs.h" -#include "filterdefs.h" #include "radius.h" #include "grtcirc.h" // for RAD, gcdist, radtomiles diff --git a/radius.h b/radius.h index 1a00c62c9..ab1b77e41 100644 --- a/radius.h +++ b/radius.h @@ -22,6 +22,8 @@ #ifndef RADIUS_H_INCLUDED_ #define RADIUS_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for ARG_NOMINMAX, ARGTYPE_FLOAT, ARGTYPE_REQUIRED #include "filter.h" // for Filter diff --git a/reverse_route.cc b/reverse_route.cc index c5101a237..ef0933038 100644 --- a/reverse_route.cc +++ b/reverse_route.cc @@ -23,7 +23,6 @@ #include // for QList<>::iterator #include "defs.h" -#include "filterdefs.h" #include "reverse_route.h" #if FILTERS_ENABLED diff --git a/reverse_route.h b/reverse_route.h index 9dc9f3ce0..af47ed4b3 100644 --- a/reverse_route.h +++ b/reverse_route.h @@ -18,6 +18,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#include // for QVector + #include "defs.h" // for Waypoint (ptr only), arglist_t, route_head (ptr ... #include "filter.h" // for Filter diff --git a/smplrout.cc b/smplrout.cc index 0a08d493c..9ad6c2b86 100644 --- a/smplrout.cc +++ b/smplrout.cc @@ -57,7 +57,6 @@ */ #include "defs.h" -#include "filterdefs.h" #include "grtcirc.h" #include "smplrout.h" #include diff --git a/smplrout.h b/smplrout.h index 21bbaec17..1acd675f0 100644 --- a/smplrout.h +++ b/smplrout.h @@ -59,6 +59,8 @@ #ifndef SMPLROUT_H_INCLUDED_ #define SMPLROUT_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for route_head (ptr only), Waypoint (ptr only), ARGT... #include "filter.h" // for Filter diff --git a/sort.cc b/sort.cc index 1efddd6db..7f3f3df20 100644 --- a/sort.cc +++ b/sort.cc @@ -24,7 +24,6 @@ #include "defs.h" #include "src/core/datetime.h" // for DateTime -#include "filterdefs.h" #include "sort.h" #if FILTERS_ENABLED diff --git a/sort.h b/sort.h index ea2af5789..4c031e47b 100644 --- a/sort.h +++ b/sort.h @@ -22,6 +22,8 @@ #ifndef SORT_H_INCLUDED_ #define SORT_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for ARGTYPE_BOOL, ARG_NOMINMAX, arglist_t, ARG_TERMI... #include "filter.h" // for Filter diff --git a/stackfilter.cc b/stackfilter.cc index aa4114d16..5306e88c2 100644 --- a/stackfilter.cc +++ b/stackfilter.cc @@ -22,7 +22,6 @@ #include // for atoi #include "defs.h" -#include "filterdefs.h" #include "stackfilter.h" #if FILTERS_ENABLED diff --git a/stackfilter.h b/stackfilter.h index c535b716b..3d8cdcc46 100644 --- a/stackfilter.h +++ b/stackfilter.h @@ -22,6 +22,8 @@ #ifndef STACKFILTER_H_INCLUDED_ #define STACKFILTER_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for ARGTYPE_BOOL, ARG_NOMINMAX, ARGTYPE_BEGIN_EXCL #include "filter.h" // for Filter diff --git a/swapdata.cc b/swapdata.cc index 45645b526..0eae5b957 100644 --- a/swapdata.cc +++ b/swapdata.cc @@ -21,7 +21,6 @@ */ #include "defs.h" -#include "filterdefs.h" #include "swapdata.h" #define MYNAME "swapdata" diff --git a/swapdata.h b/swapdata.h index 37765d3f0..498dbdc51 100644 --- a/swapdata.h +++ b/swapdata.h @@ -23,6 +23,8 @@ #ifndef SWAPDATA_H_INCLUDED_ #define SWAPDATA_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for arglist_t, Waypoint #include "filter.h" // for Filter diff --git a/trackfilter.cc b/trackfilter.cc index c7c99a39d..018d3110a 100644 --- a/trackfilter.cc +++ b/trackfilter.cc @@ -48,7 +48,6 @@ #include // for qAsConst, foreach, qPrintable, QAddConst<>::Type, qint64 #include "defs.h" -#include "filterdefs.h" #include "trackfilter.h" #include "grtcirc.h" // for RAD, gcdist, radtometers, heading_true_degrees diff --git a/trackfilter.h b/trackfilter.h index d0caadaba..2261bfbf8 100644 --- a/trackfilter.h +++ b/trackfilter.h @@ -24,6 +24,7 @@ #include // for QDateTime #include // for QList +#include // for QVector #include // for qint64 #include "defs.h" // for ARG_NOMINMAX, route_head (ptr only), ARG... diff --git a/transform.cc b/transform.cc index b573ffe19..7877a3ffd 100644 --- a/transform.cc +++ b/transform.cc @@ -26,7 +26,6 @@ #include // for foreach #include "defs.h" -#include "filterdefs.h" #include "transform.h" diff --git a/transform.h b/transform.h index 6577bc322..62949ad82 100644 --- a/transform.h +++ b/transform.h @@ -24,6 +24,8 @@ #define TRANSFORM_H_INCLUDED_ #include // for QString +#include // for QVector + #include "defs.h" // for route_head (ptr only), ARG_NOMINMAX, ARGTY... #include "filter.h" // for Filter diff --git a/validate.cc b/validate.cc index 69bfdead1..df7d2b8ee 100644 --- a/validate.cc +++ b/validate.cc @@ -21,7 +21,6 @@ */ #include "defs.h" -#include "filterdefs.h" #include "validate.h" #include diff --git a/validate.h b/validate.h index cff72bce6..69ac3bb85 100644 --- a/validate.h +++ b/validate.h @@ -23,6 +23,8 @@ #ifndef VALIDATE_H_INCLUDED_ #define VALIDATE_H_INCLUDED_ +#include // for QVector + #include "defs.h" // for route_head (ptr only), ARGTYPE_BOOL, ARG_NOMINMAX #include "filter.h" // for Filter -- 2.30.2